bitkeeper revision 1.1041.1.9 (40e43dae6tkOjKpGS7n77Q_WIw-vwg)

Fixing drive finding with scsi arrays in Xend

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 04eb20bb841193f07cf647bdb0fdcaf8f6ca6378..bcbf3eae42455faf5933ba6ea4ed175ace0b7044 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -39,4 +39,5 @@ smh22@uridium.cl.cam.ac.uk
 sos22@labyrinth.cl.cam.ac.uk
 tlh20@elite.cl.cam.ac.uk
 tlh20@labyrinth.cl.cam.ac.uk
+tw275@striker.cl.cam.ac.uk
 xenbk@gandalf.hpl.hp.com

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index c0de8fed012fcb6016f376addc84e7b92bb46d5f..869fc28e07c7c6002ea26418f4f7330b598248eb 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -79,8 +79,13 @@ def lookup_raw_partn(partition):
 
     if not re.match( '/dev/', partition ):
         partition = '/dev/' + partition
-
-    drive = re.split( '[0-9]', partition )[0]
+        
+    """Try and match non-standard scsi raid arraysa
+    """
+    if re.match( '/dev/cciss/c[0-9]+d[0-9]+p[0-9]+', partition ):
+        drive = re.split( 'p[0-9]+', partition )[0]
+    else:
+        drive = re.split( '[0-9]', partition )[0]
 
     if drive == partition:
         fd = os.popen( '/sbin/sfdisk -s ' + drive + ' 2>/dev/null' )